From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 31 Jan 2020 16:56:40 +0000 (+0100)
Subject: st/theme-node: Support "auto" in lengths
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~76
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fc36837606bb8b66c6426b686a2d8e151bb36a3c;p=gnome-shell.git

st/theme-node: Support "auto" in lengths

This allows resetting a fixed size to the default in a more specific
selector.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/971
---

diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index bb630d9d3..31057b012 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -1707,7 +1707,13 @@ do_size_property (StThemeNode   *node,
                   CRDeclaration *decl,
                   int           *node_value)
 {
-  get_length_from_term_int (node, decl->value, FALSE, node_value);
+  CRTerm *term = decl->value;
+
+  if (term->type == TERM_IDENT &&
+      strcmp (term->content.str->stryng->str, "auto") == 0)
+    *node_value = -1;
+  else
+    get_length_from_term_int (node, term, FALSE, node_value);
 }
 
 void